From feba8983ac943fabeb4481e45b5fd4c8524db175 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 26 Nov 2025 17:04:11 -0800 Subject: [PATCH] kernel: disable non layout u-boot,env All users of regular CONFIG_NVMEM_U_BOOOT_ENV have been converted to use layouts. CONFIG_NVMEM_U_BOOT_ENV selects the layout variant anyway so this is safe to do. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16376 Signed-off-by: Hauke Mehrtens --- target/linux/apm821xx/config-6.12 | 1 - target/linux/ath79/config-6.12 | 1 - target/linux/ath79/mikrotik/config-default | 1 - target/linux/bcm4908/config-6.12 | 1 - target/linux/ipq40xx/config-6.12 | 1 - target/linux/ipq806x/config-6.12 | 1 - target/linux/mediatek/filogic/config-6.12 | 1 - target/linux/mvebu/cortexa72/config-6.12 | 2 +- target/linux/qualcommax/config-6.12 | 1 - target/linux/qualcommbe/config-6.12 | 1 - 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/target/linux/apm821xx/config-6.12 b/target/linux/apm821xx/config-6.12 index 7d9f4b74be..e242b05723 100644 --- a/target/linux/apm821xx/config-6.12 +++ b/target/linux/apm821xx/config-6.12 @@ -176,7 +176,6 @@ CONFIG_NVMEM=y CONFIG_NVMEM_LAYOUTS=y CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ath79/config-6.12 b/target/linux/ath79/config-6.12 index 9c723ab6b8..7bf2204860 100644 --- a/target/linux/ath79/config-6.12 +++ b/target/linux/ath79/config-6.12 @@ -153,7 +153,6 @@ CONFIG_NVMEM=y CONFIG_NVMEM_LAYOUTS=y CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default index 57b697a13d..991ab7a3ac 100644 --- a/target/linux/ath79/mikrotik/config-default +++ b/target/linux/ath79/mikrotik/config-default @@ -36,7 +36,6 @@ CONFIG_NET_DSA=y # CONFIG_NVMEM_LAYOUT_MIKROTIK is not set # CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set # CONFIG_NVMEM_SYSFS is not set -# CONFIG_NVMEM_U_BOOT_ENV is not set CONFIG_PHYLINK=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_SGL_ALLOC=y diff --git a/target/linux/bcm4908/config-6.12 b/target/linux/bcm4908/config-6.12 index f65adb4bf6..54c56bb388 100644 --- a/target/linux/bcm4908/config-6.12 +++ b/target/linux/bcm4908/config-6.12 @@ -202,7 +202,6 @@ CONFIG_NVMEM=y CONFIG_NVMEM_LAYOUTS=y CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ipq40xx/config-6.12 b/target/linux/ipq40xx/config-6.12 index 320faf6cd8..d822dadfd7 100644 --- a/target/linux/ipq40xx/config-6.12 +++ b/target/linux/ipq40xx/config-6.12 @@ -336,7 +336,6 @@ CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set # CONFIG_NVMEM_SPMI_SDAM is not set CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ipq806x/config-6.12 b/target/linux/ipq806x/config-6.12 index dbda0cc752..6ade610d56 100644 --- a/target/linux/ipq806x/config-6.12 +++ b/target/linux/ipq806x/config-6.12 @@ -331,7 +331,6 @@ CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set # CONFIG_NVMEM_SPMI_SDAM is not set CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/mediatek/filogic/config-6.12 b/target/linux/mediatek/filogic/config-6.12 index 9928fb3090..1fae94f012 100644 --- a/target/linux/mediatek/filogic/config-6.12 +++ b/target/linux/mediatek/filogic/config-6.12 @@ -340,7 +340,6 @@ CONFIG_NVMEM_LAYOUT_ADTRAN=y CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_MTK_EFUSE=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_DYNAMIC=y diff --git a/target/linux/mvebu/cortexa72/config-6.12 b/target/linux/mvebu/cortexa72/config-6.12 index eb53d98e5c..4080fe278a 100644 --- a/target/linux/mvebu/cortexa72/config-6.12 +++ b/target/linux/mvebu/cortexa72/config-6.12 @@ -79,8 +79,8 @@ CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NVMEM_LAYOUTS=y CONFIG_NVMEM_LAYOUT_MIKROTIK=y CONFIG_NVMEM_LAYOUT_ONIE_TLV=y +CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_PARTITION_PERCPU=y CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y diff --git a/target/linux/qualcommax/config-6.12 b/target/linux/qualcommax/config-6.12 index 5ce1483c76..40f2f3172c 100644 --- a/target/linux/qualcommax/config-6.12 +++ b/target/linux/qualcommax/config-6.12 @@ -299,7 +299,6 @@ CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/qualcommbe/config-6.12 b/target/linux/qualcommbe/config-6.12 index a6507ac858..360b2abd3c 100644 --- a/target/linux/qualcommbe/config-6.12 +++ b/target/linux/qualcommbe/config-6.12 @@ -299,7 +299,6 @@ CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y -- 2.30.2